Fixed staging bugs in develop branch for row-fluids.