Fix stuff here and there.

Administrator requested to merge ci-try-megre-contrib-and-stuff into ci-merges Jul 17, 2019