Fixed non-unified build issues