MANTA-67 more fixes/adjustments