Update Berksfile to new format and fix a couple of other things