Misc fixes for some content errors