clean up several warnings