Another fix and cleanup

Hooray!