Merge "Consistency tweaks"