Some minor tweaks

Change-Id: I9b9f818f960739eb74b19da991dad47d2f586242