Minor changes for caanoo.