Small fixes here and there.