Fixed imports from self