Committing fixes for wed.