More JCup Fixes