Minor changes to 1.4 and 1.5