Make file and requirement fix