Fix parsing methods