Fixed for 1.9 warnings.