7.x-1.4 release - misc fixes