Change manifest source and some kernel changes