more fixes for minor warnings