Merge pull request #245 from infapi00/fix-internal-99-and-100-combined

Fix internal 99 and 100 API issues