small production fixes