Repairing some things