Fix scaffold generator