Fixed complier warnings
* Prevented duplicate defines