Fixes WORLDGUARD-2330 and WORLDGUARD-2994