- Fix usage of vanilla goals