Fixing make problems