Fix for db dump issues