small fixes to pass tests