Fix portability of Definitions