Last little fixes. Time to submit!

Signed-off-by: Paul Milham <domreinalabaster@gmail.com>