Fixing issues related to status code.