Fix obvious problems from switch to dict views. Some tests still fail over

some reference count issue (I think).