Fix locations and added 2.9.2