Fix surface orientation warnings