Fixed stupid bugs on pre 4.2 devices