Fixing after moving Goat to core