Committing a bunch of fixes.