1.17 - Minor fixes