myriad fixes to get neotoma to build