Grade reversals before and after corners should control the water pretty well, might take some work if the trail is already well established. As for the second spot, can you get material down the fire road? Haul in a bunch of rock if possible and you could rebuild it with rock and outslope it or excavate and pipe it under the trail. Added benefit of the pipe is you can inslope the trail all around the low spot to keep it dry.