thrust behaviour fixes