Minor changes and merge