Fixed imports and small issues.