Minor changes for the next version