Fixed imports problems