Fix  issues