Changes for 10.10 upgrade