Small consistency improvements