Various tweaks to work around Blogofile changes