Fixed build errors after initial commit