Bug fix in USF_Init and UWA_Bnd