Last batch of fixes for 1.6.2-PRERELEASE