Cosgrove: Database Fixes