Make fixes