Fixed broken import references