some more bug fixes

No match.