Bug fixes for Issue #11 and Issue #12