some imports fixed