couple more production hotfixes.