Fix some more reported bugs.