Minor fixes for 6.4.0