more changes to help build kernel