Minor improvement to scaffold