Minor changes for new version