Minor fixes to work with latest version of October