Fixed crash in unrooted phones and some other minor changes.