fix remaining warnings