Merging some minor things