Address some of Timo's issues.