Issue #121 - Fix implementation errors