Fixes to the 0.2.1 collect script after testing