Add repair hotzones to gates; resolves #55