Consistency tweaks.