terminator fixes