Fixes: Some consistency things.