Consitencty fixes