Fixed two issues