1.6.1

Few fixes