Fix various issues...

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>