clean up warnings, etc.