Workarounds, fixes, new command.
Waterwalk fix