Forgotten things from CI3 upgrade and little fixes

Some things I missed during the CI3 upgrade and few little
fixes/changes.