Consistancy fixes.