One fix and one enhancement