Fix gcc compiler failures