Fix many issues with capture