Fix misc derps in scaffold generator