Small fixes
merging