Better serial handling