various minor changes for prod