Some bug fixes at the Decorate and Reshape steps