Some bugs fixed

[permalink]