Draft build fixes, some more details