Few fixes.

see #622