More xsthammer improvements (using xst 14.5 now)