EARGF and other trivial fixes