Fixed two more bugs