Final commit for 1.6.0

Just some compatibility and cosmetic issues.