Correcting some small bugs [release-1.2]
Merging to develop