Fixed bugs in develop