Miscellaneous cleanup/fixes

Tidying up before I start on BuddyPress components