Minor changes to conv-mach.h/sh