Fixed some problems with WEPIF