few staging fixes