2/10 - Minor fixes