Fix how we prepare security