Fixed problems with defines