Simple terminator fixes