More DB_Procedure Fixes

Just some Logic Fixes