General fixes from production