fix some subrs