Cleanup and fixing of broken things