Fixing various small mistakes