Correcting some changes related to error codes and like unlike framework