Fixed some bugs I forgot about