Gist fixes