general consistancy fixes