Hopefully finally fixing Plasmarine and Bari