A couple fixes