fixes to the stage2 build following removal of old FFI syntax