Added moar stuff needed by previous stuff to make it build