Minor changes
after merging