Fixes for JSON duplication within the Steps