Updates to 1.2.17