A couple of last fixes for staging