Fixing a few other issues.