Final update for 1.6.4. Minor changes