PVP/PVE and config fixes