Added more stuff to be compatible with fork source