Various fixes to content