Security and minor updates