Fix outstanding issuess after moving code base