Few fixes.

see #574