Minor changes. No security issues here!