fixing some imports