Some 5.04 changes