Fix pointer issues & remove dep for ADD in dockerfile