Fixed staging errors