Fix two bug