Maliit and Switch changes

as discussed in IRC