more signature fixes