Staging fixes

Fixes #120 #118 #110