More changes to help eliminate API crashes