Fixing more uses of statics in Subsite class