Fixes for working with new ansibke