Fixes for sumpy custom deriv taker branch