Prepare for 1.16