Fix requestCode issues