bug and security fixes