Some fixes to allow ROM to build