Minor fixes...