Multiple Fixes from Issues

See commit comments.