Marge latest fixes from statusbits master