Fix make install, clean up