Fixes.

see #491