miscellaneous aliasing/build/note fixes