Fixed some arguments and makefiles