fix a few declarations