Last fixes.

see #609