Secuity fixes