small fixes so that it runs