General cleanups patch from James H: