Last fixes Android