Checkedin changes related to small fixes.