Adds a couple of minor security fixes identified by Coder Review module.