Cleaning up problems from workshop