More fixes to build file zipping