Staging fixes