Fixed TODO items in the Action Kernel