Fixed staging bugs in develop banch.