Fixed two github issue