Fix issue #36 and #35.

Fix the last ingo issues.