DB Generate Fixes