Fixed two more bugs.