Staging fixes made