Commit version 1.6

Simple fixes