Finished upgrade to 1.6