Some more catches and small tweaks for issue #6. [skip ci]