Close Fix
Some data fixes