Moved some stuff to assure it builds