YAW fixes