Kernel manipulator improvements:
    - small performance improvement