Fix WordGuard + minor fixes