Staging - small fixes and initial translation