Update to latest database
Small fixes
Small Fixes