Add some stuff to fix