MANTA-20 minor fixes prior to master update