Fixes for orientation