add saner diff defaults