more fixes from production