Fixes from production