INteraction fixes