Miscellaneous temporary fixes to get app to build