Misc changes (fixes #88)