Update to latest database
Small fixes