Fix ups due to resource manager cleanup