Fixes to the new take functionality