School safety bills heading to Governor