RP4WP tweaks