Fixes for getting started build. Broken after big repo move refactoring.