More fixes, wip