Additional cleanup
Bug fix, cleanup.