Fix potential segfault
Clarify some UT changes
Clean up some unnecessary iFCs