Meta fix and code cleanup.