Pushed changes for JBX-Kernel