Some updates for generic security purposes, RSpec 3 preparation.