various changes necessary to get production running