Add last year's changes which never made it up to GitHub
fix build