Final rotation fixes