Changes to make the dev env. work with the latest gadgets + rtgov.