Some misc changes to quickly related build files