minor: fixes to build problems