Fixed not found issues