Some minor fixes here and there