Fixed production bugs in develop branch.