Orientation bugs fixes