Fixes for takes as a function