Fixes for minor, but breaking bugs.