Bring the fork up-to-date

Make the fork ready for further updates