Fixed two more issues