Make fixes(wip)