Modifications to match WorldGuard, bugfixes