few more #ifdef's