Fix some comparisons and test higher baud rate