Minor fixes to allow the new content to compile