2.1.6 - Minor fixes