More cleanup and fixes.

Signed-off-by: Garrett Cooper <yanegomi@gmail.com>
4 files changed