avoid a couple warnings, and some general house cleaning