Kernel manipulator improvements:
    - fyx typos
    - added additional case coverage