Content fixes to #567