Fixes for tiny bugs we discovered during a test day.