stages: fixes