fixes #907 and fixes #908

Pretty simple.
This is in response to an email I got today and there's not an issue for it.