Fix onResume issues