minor fixes here and there