Merge branch 'SerialMux' and compiler suggested cleanup