fix up two more functions