Miscellaneous changes necessary for production