fix the remaining warnings