fix some declares