A Closer Look at Robustness to L-infinity and Spatial Perturbations and their Composition