Adapting to new physics.h