Added stuff for multipath support and another workaround for serial