Additional ML2 updates and fixes