Restored some lost sound changes
Temporarily fixed merge conflict
Fixed build errors on Visual Studio