Update to 1.6.4 and environment changes