Fix and merge changes