Fix (width,height) swaps