Patches to various design bugs.