Software mode fixes (thanks dukope)