Model rotation fixes