committing latest fixes that broke the build