test compiles and related fixes.