Fix warning and build issues

As reported by Jonathan Kew on the list.
2 files changed