Fixed meta area
More cleanup