Fixes to wi parse