Updates for 1.6.4 friendliness