Trailers: Minor clean up