Similar fixes like before.