Fix issue with imports