Moved some more stuff to common