FIX final tweaks