Replaced #else defined with #elif to better help compile errors