Make updates due to kernel/kernel-impl refactoring

Related to: https://www.pivotaltracker.com/story/show/70718582