Fix assist bugs