Fix the perl stuff too as the other branch will just rebase on this one