Derivative fixes, vectorization ...