Updates to prep for split incompatibility