Cambodia and Thailand have made progress resolving their maritime dispute, but underlying tensions and disagreements over their land border remain a significant source of instability between the two countries.