Small production fixes