Some fixes for Subversion commits

Change-Id: I5a2bcc74ecf72a82e5c9b8c2b93adcfbab769cd2