Minor cleanup

Trying to fix some bugs. Can't find them, but I can fix a little here
and there.