Notice/warning fixes. Version set to 1.6.1.