fixes to make meta stuff a bit less invasive