Makr sure scaling and orientation play nice together