Fix 2 errors after merge.

Signed-off-by: nppangband <nppangbanddev@verizon.net>