Fix part generation issues