Fixed pointer paths for 4.21