Some 1.5.1 and other fixes.