Fix OLM bugs to make olm functional tests running