Took care of some parsing related issues