Correct issues as notified by csaba.