More fixes + cleanup