Fixed security bugs for EXERCISE 2