Get ordering/locking better. Updated metadata while initing should be noticed now.