More gcc compiler issues fixed