Minor cleanup and build config fix

The x86 and x64 build configurations were broken, so I fixed them!