Couple of fixes and some additions for 1.7.2