Core/Guilds: Some stuff that didnt get staged...

Also fixed non-PCH build (I guess, not enough horsepower to check myself sadly)