Fixed a couple broken API's
Updated module with API fixes