Adjustments to meta handling logic