Issue #110 - Applying fixes