Various fixes to scaffold and resource generators