Small clean ups of warnings, etc