Fixed two known bugs.