WIP redid build fixes, some overlap with forgotten push