More fixes. Damn you awesome.