Few fixes.

fix #603