fix 2 -Wnon-literal-null-conversion errors

also update greg.c