Fixed two issues.