fix some smaller issues.