Fixes here and there.