Correct package/version conflicts that were missed out from previous merge.
Tested on jam, koala, ostrich, platypus.