Fix import policy issues