Small fixes to adapt staging