Fixed bugs in develop branch