Few fixes.

see #89