Fixed a few API issues with the new feature.