Minor changes to facilitate bug hunt