gcc compatibility changes for blakcomp