Changes for 0.98.2