Various fixes tracking mLib changes.