Make Format Elements Local
More fixes for the new SDK