Added extra support for API inconsistencies

Fixes #58