Fixes, issue #60, issue #58