Some final quick  fixes.