Change procedure name due to conflict
Add missing constants
Add some error checking to windows build scripts