#10717: Addressing issues brought up by Axel and Gerasim

Signed-off-by: Jessica Hamilton <jessica.l.hamilton@gmail.com>