Fixes and 1.7.10 update