Improve juggling-types handling; fixes