fix some minor warnings, etc