warning fixes wip