Fixes to murano module

Change-Id: I65ba4c30abbede18e44384bb8bc0f20918f5af6a