fix up some spec/factory things