Fixed staged bugs in develop branch