Add more warnings, sort some by groups