Make things not broken