Four distinct fixes for significant incorrectness bugs, as three small commits See merge request !481