1.6.4 basic fixes