Further momentum fixes