Syntax fix, merge parameters, compatibility with chef solo