Fixed Kyle's found bugs.