More fixes/updates for 1.7.7