fixes for compiler warnings (wip)