Update to latest 'develop' code and fix new errors