Fixing the rest of the plus versus asterix issues