Minor changes to deriver().