National: fixed minor errors caused by Timo's last commit.