Security Fixes and updates