Some updates from manta kernel