More marc4{j->g} conversion and general hacking
Tweaks to fix compilation