Some final consistency fixes.