Fixing orientation issues