Minor additions and fixes for 1.7.2