Multiple Fixes from Issues

Fixes #349
Fixes #352