Security patch
small changes