Tweaked some parsing code