src: Small improvements

Change-Id: I9850cd6ec2330482915f815d94a2ac2ccaeae7f1