Issue #134: 3 issues

This solves 3 issues on #134.