Repaired several bugs with scaffolding code