various fixes to run on B12