Few bug fixes here and there.