Little fixes here and there.