Hotfixes to security