Kernel conf changes and deployment changes