More fixes and cleanup.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>