Commiting fixes from local repo