Fix UT and GB issues