Update to match with new Math libraries