A couple things for consistency