Minor fake parts generation fixes