CLOUDIFY-1944 some small dsl fixes.