Final bugfixes for 1.6 - Starting 1.7