Upgrade to apm 0.64