Fix the basic build