Various production fixes