Fix a couple bugs introduced last commit, remove more Subsonic prefixes, fix a couple special case bugs