Fixed type comparisons, change sound defs to const