Schema fixes and fixed _security.