More physics fixes