fix to version
added minor fixes from trunk since release of 1.7