More version 1.5.9 changes...