Fixing all Make problems