Minor, but significant bug fixes.