#10717: Addressing issues brought up by Axel and Gerasim