Fixes to blogger after merge