src: Minor corrections and improvements

Change-Id: If1041d13b7c469e64e3523297438067baf96b1d6