fix some other compile issues i introduced at the last minute, after testing
2 files changed