Some small changes to the paver script to be more flexible