US fix and widget fix