TREFF: Last fixes
TREFF: Re-enable re-writes for the server