Fix stuff to make things work