Fix and cleanup meta