Cleanup and bugfix.