A couple fixes to fix things.