ArchiKernel: Fix some issues