Minor updates to allow for scaled stages.