General fixes
merging changes