Changed some stuff to ensure clean installation