Some Fixes?