Fixes, wip