Fixed a few outstanding issue presented in the pull request.

Signed-off-by: Jared Woolston <jwoolston@tenkiv.com>