Fixes for non-compliance with schema and freight service expectations