fixing some mem faults in fuji with companion