fix obscure issue with grk, cleanups