Bug fixes - DRC and Add current user as SQLAdmin