Moved some stuff to allow stingray and everest builds