Hacks to get new and old stuff to work together