whoops, a couple fixes