fixups, get it all compiling