Fix import dependencies