Fix some problems, more uncovered though.