*8573* Consistency tweaks