More build file corrections