Address Timo's review comments.