Mark some stuff as public.
I forgot to do so the first time around.