Small cleanup and debug