Database Fixes