More work arounds for orientation issues