Initial security improvements