Fixed some funky format parsing