Fixing various issues.