Fixes identified through PR review. Thanks rbarlow!