fix defines issues