Merging just few minor things