Fixing initial build errors