Fix errors and warnings in previous set of commits.

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