Really fix linux build (gcc is happy now, too)