Added some fixes to demonstrate commit
Added some fixes to demonstrate commit