Updated for 1.6.4 dev builds