Wifi, Sbus, Cosmetic Fixes