Improved capture error handing
Misc tweaks