Build Script: Some more fixs