Some fixing here and there.