Clean up a bit, cleaner suppression, should also repair windows if it was broken