Updates to run on CM10.2