Minor fixes here and there