General repairs and cleanup