port of on-the-fly fixes on production site