Henry: fixing some bugs