Migrate away from SF, update kernel source