Clean up, fix errors.