makeapi adjustments for 5.21