Minor Fixes and DB update