fix Start/Sink issues