Security again the patch and some more tweaks