A couple of small fixes here and there.