Fixed a couple errors I was getting.

Still lots of work to do in order for me to clean this up, but this is
the most I'll do before the main repo gets the new setup.
Signed-off-by: captain_shadows <captain_shadows@aol.com>