wip - remove some warnings