Improved PART handling.