Fixed preprocessor bugs (related to testflight)