Wireless Cab fixes and tweaks