consistency improvements