Fixed staging bugs
Fixed staging bugs