Fixes to make it work with the metagene example: intercept issue.