Fix a few wolf issues
Merge remote-tracking branch 'sk89q/master'