Fixing build issues caused by changes in WALA API