Updating for 1.6.2 changes