Minor fixes here