few fixes for trailer arrangement