Fix import issues