Fixing some imports