Fixed capitalization
Added patches from the current .make file