More Materialization updates and fixes