Fixed orientation issues