Few fixes.

fixes #422