Small cleanup and repairs