Aspect-ratio fixes