Various fixes for Heat managed Resources