Move more stuff to FixConfig