Even smaller fixes