Bug fixes to field orientation