Reorder stuff to try and fix build