- Minor fixes