Little changes on kernel