Various opentrail and hikar tweaks