Fix invalid logic error, silence some build warnings

Fixes issues in pull request #28

Fix assertion failure crashes

Fixes issue in pull request: #26