A couple of tiny fixes