Bring up to date

Fixes various issues.