gcc types fixes