Some fixes wip