Minor Fixes wip