Consistency tweaks