Some Fixes Came