Issues 348&350

56a8b05 references wrong issue, should be #350.

Fixes #348 and #350