Re #1096: Extra fixes