Fixed the rest of the gradients