MANTA-70 a few more fixes to get this working