Performance & Pen test fixes