ANTARCTICLE-180 Code review fixes