Fixes namefinding errors