Compile warning fix.
Compile warning fix.
Re-apply saphira's Linux build patch that somehow got lost in merges