Little fixes for 1.6.4