More derivatives (starting to get lost with the indices - I can't see an easy way to check the derivatives...)

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>