Fix Pikachoose issues