Some build file fixes