Adding defines & correct typo