Fixed staging bugsin develop branch