Fixed some #ifdef mess