two small fixes to make tests work