Fix a few more #ifdef's
2 files changed