Minor Source code changes