Fixed some missing stuff