Fixes for OpenStack
Merge pull request #197 from frodenas/master

Fixes for OpenStack