Fixed linker errors for sounds
Hopefully fixed merge conflicts