Some small fixes here and there for tomorrows show-and-tell.