Security and bugfixes