Fixes for genexample