Further changes to UART