Fixes for the gist