Updating to use the latest fixed modules while working on releasing 2.1