minor updates, sync a fix from swagger module