Minor stuff
Only store security events that we actually need
More minor stuff