More compiler proof repairs