0.36.1 Components not loading

I have updated to 0.36.1 from 0.35.3 and the Sun component and the Upnp have given me errors.

17-01-25 15:19:54 homeassistant.bootstrap: Error during setup of component sun
Traceback (most recent call last):
  File "/srv/hass/lib/python3.4/site-packages/homeassistant/bootstrap.py", line 151, in _async_setup_component
    None, component.setup, hass, config)
  File "/usr/lib/python3.4/asyncio/futures.py", line 388, in __iter__
    yield self  # This tells Task to wait for completion.
  File "/usr/lib/python3.4/asyncio/tasks.py", line 286, in _wakeup
    value = future.result()
  File "/usr/lib/python3.4/asyncio/futures.py", line 277, in result
    raise self._exception
  File "/usr/lib/python3.4/concurrent/futures/thread.py", line 54, in run
    result = self.fn(*self.args, **self.kwargs)
  File "/srv/hass/lib/python3.4/site-packages/homeassistant/components/sun.py", line 135, in setup
    from astral import Location
ImportError: cannot import name 'Location'
17-01-25 15:19:59 homeassistant.bootstrap: Error during setup of component upnp
Traceback (most recent call last):
  File "/srv/hass/lib/python3.4/site-packages/homeassistant/bootstrap.py", line 151, in _async_setup_component
    None, component.setup, hass, config)
  File "/usr/lib/python3.4/asyncio/futures.py", line 388, in __iter__
    yield self  # This tells Task to wait for completion.
  File "/usr/lib/python3.4/asyncio/tasks.py", line 286, in _wakeup
    value = future.result()
  File "/usr/lib/python3.4/asyncio/futures.py", line 277, in result
    raise self._exception
  File "/usr/lib/python3.4/concurrent/futures/thread.py", line 54, in run
    result = self.fn(*self.args, **self.kwargs)
  File "/srv/hass/lib/python3.4/site-packages/homeassistant/components/upnp.py", line 26, in setup
    import miniupnpc
ImportError: No module named 'miniupnpc'
17-01-25 15:20:01 homeassistant.core: Error doing job: Task exception was never retrieved

Any help pleaseā€¦