Build fixes, test app compiles (does not yet run)