Fix issues with imports