Cleaned up some parsing issues